gdk: Stop using deprecated pango api

diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index cad938f5f02bfc091bc83e28acf62c14c7472647..9a6809d23bd2682a22d07307fc1b2778776404ed 100644 (file)
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -31,12 +31,13 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <fribidi.h>
 
 #include "gdk.h"
 #include "gdkwayland.h"
 
 #include "gdkprivate-wayland.h"
-#include "gdkinternals.h"
+#include "gdk-private.h"
 #include "gdkkeysprivate.h"
 
 #include <xkbcommon/xkbcommon.h>
@@ -499,7 +500,7 @@ update_direction (GdkWaylandKeymap *keymap)
              {
                PangoDirection dir;
 
-               dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
+               dir = gdk_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
                switch (dir)
                  {
                  case PANGO_DIRECTION_RTL:

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index be54e66e18bffdbeeef0779100db6b587f3ee9b2..4c27ac34724d6dedc5a3d6c1ec965d5955b818b9 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -29,6 +29,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdk-private.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -480,7 +481,7 @@ get_direction (XkbDescRec *xkb,
     {
       gint level = 0;
       KeySym sym = XkbKeySymEntry (xkb, code, level, group);
-      PangoDirection dir = pango_unichar_direction (gdk_keyval_to_unicode (sym));
+      PangoDirection dir = gdk_unichar_direction (gdk_keyval_to_unicode (sym));
 
       switch (dir)
         {